Merge "Fix build with new Interface am: af51a2acde am: 3b9fe61b5e" into nyc-mr1-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 27 Jun 2016 19:11:41 +0000 (19:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 27 Jun 2016 19:11:42 +0000 (19:11 +0000)

Trivial merge