Merge in code from gles32-dev
authorPyry Haulos <phaulos@google.com>
Mon, 8 Feb 2016 23:07:48 +0000 (15:07 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 8 Feb 2016 23:08:15 +0000 (15:08 -0800)
Change-Id: Id3b56b345c8062ca0a79e01f7e2d943dd53672bb


Trivial merge