Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 12 Jan 2018 18:33:20 +0000 (10:33 -0800)
committerChris Forbes <chrisforbes@google.com>
Fri, 12 Jan 2018 18:33:20 +0000 (10:33 -0800)
Change-Id: If6c19e0cbe0011053af9abe2632534ed23e8a8fe


Trivial merge