Merge \\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\" into nyc-mr1...
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:45:07 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:07 +0000 (20:45 +0000)
am: 2dc4d39d70

Change-Id: Iec54c2ef5a58363948dfe6d0d5ab32944e7c889e


Trivial merge