Merge in fixes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Mon, 14 Dec 2015 23:14:51 +0000 (15:14 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 14 Dec 2015 23:14:51 +0000 (15:14 -0800)

Trivial merge