Merge \"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\" into nyc-mr1...
authorJulien Desprez <jdesprez@google.com>
Mon, 27 Jun 2016 19:15:58 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 19:15:58 +0000 (19:15 +0000)
am: 114f46a0dc

Change-Id: Ib1be550cafb93990b67853bc548045461a2de310


Trivial merge