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

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

Change-Id: I7ee6bae41a36c4fd9972696e75c60e68c627c900


Trivial merge