Merge aosp/master into aosp/deqp-dev
authorPyry Haulos <phaulos@google.com>
Tue, 4 Apr 2017 21:52:52 +0000 (14:52 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 4 Apr 2017 21:52:52 +0000 (14:52 -0700)

Trivial merge