Fix build with new Interface am: af51a2acde am: cee1bcdedd am: 93f94f0d2e
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:45:05 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:05 +0000 (20:45 +0000)
am: 244b38f434

Change-Id: Ifbbb9a79c095be43ef0a4954eaece8c8afd0ed8c


Trivial merge