Merge \\\\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\\\" into nyc...
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:50:30 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:50:30 +0000 (20:50 +0000)
am: 49723e9172

Change-Id: I8e0281fc4a0c38439612eba07a9149f5a182a73a


Trivial merge