Fix -Wc++11-narrowing warnings am: 41460f757d am: 90b58859d2 am: f2ca32c7af
authorColin Cross <ccross@android.com>
Tue, 22 Aug 2017 18:33:39 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:33:39 +0000 (18:33 +0000)
am: dc163299e9

Change-Id: I0c44dab71a70ea04a4e2e91fb8772a169f089513


Trivial merge