Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 3 May 2018 17:11:46 +0000 (10:11 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 3 May 2018 17:11:46 +0000 (10:11 -0700)
Change-Id: I24e845d3dd6283d88fed3fb17db9a5379e620a99


Trivial merge