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

Change-Id: I6feb4c17c6c08ff702b5fc2d6e846b1f18c22cc8


Trivial merge