Fix build with new Interface am: af51a2acde am: cee1bcdedd am: 93f94f0d2e am: 244b38f...
authorJulien Desprez <jdesprez@google.com>
Tue, 22 Aug 2017 17:22:05 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:22:05 +0000 (17:22 +0000)
am: 765ee043e4

Change-Id: I6d8dda9417d92209579df536a9431f9e4fb7deff


Trivial merge