Use de::min instead of std::min
authorMikael Tuomisalo <mikael.tuomisalo@siru.fi>
Mon, 9 Apr 2018 18:50:26 +0000 (11:50 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 18:50:26 +0000 (11:50 -0700)
am: 1d08d3f4fe

Change-Id: I2fe6933d6123432679d00448599a74c9e6e4d134


Trivial merge