Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 18 Dec 2017 18:58:37 +0000 (10:58 -0800)
committerChris Forbes <chrisforbes@google.com>
Mon, 18 Dec 2017 18:58:37 +0000 (10:58 -0800)
Change-Id: I4d373d9415e648dce80dc7c6112df5743a34cb54


Trivial merge