Fix build with new Interface am: af51a2acde
authorJulien Desprez <jdesprez@google.com>
Mon, 27 Jun 2016 19:11:29 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 19:11:29 +0000 (19:11 +0000)
am: cee1bcdedd

Change-Id: I52b57b1ca9da796b4576bed79a43662f244ff32c


Trivial merge