Merge \\\\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\\\" into nyc...
authorJulien Desprez <jdesprez@google.com>
Tue, 22 Aug 2017 17:22:25 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:22:25 +0000 (17:22 +0000)
am: 59e8008a6e

Change-Id: Ia936964fa28c92d1a829f14e443ccd3c3e17a769


Trivial merge