Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 14:40:15 +0000 (14:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 14:40:15 +0000 (14:40 +0000)
am: db45dfc398

* commit 'db45dfc39892a14cac9b6b5cfde492b7e8ccfd46':
  Merge bug fixes from Khronos CTS release branch

Change-Id: I5f90b8de83f80cb186ddee038414408ca0405ce2


Trivial merge