Merge "Fix build for surfaceless target"
authorChris Forbes <chrisforbes@google.com>
Wed, 15 Aug 2018 14:49:36 +0000 (14:49 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 15 Aug 2018 14:49:36 +0000 (14:49 +0000)

Trivial merge