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

Change-Id: Iadda7383657b4ece448f3d4fb9f9c9d4264d9047


Trivial merge