Merge "Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a am: db45dfc398...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 27 May 2016 14:40:30 +0000 (14:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 14:40:30 +0000 (14:40 +0000)

Trivial merge