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

Change-Id: Id1ffcd8a9ac7fa216c84014c003498c99226de89


Trivial merge