Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 21:39:14 +0000 (14:39 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 21:39:14 +0000 (14:39 -0700)
Change-Id: Iec81ca5b6484d6571cc13e46acca1973d5203cfe


Trivial merge