Merge "Fix build for surfaceless target"
authorChris Forbes <chrisforbes@google.com>
Wed, 15 Aug 2018 15:59:27 +0000 (08:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Aug 2018 15:59:27 +0000 (08:59 -0700)
am: 467f04a332

Change-Id: Ida64139209722b8278ca01f8f045f211677cac50


Trivial merge