Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:17:33 +0000 (16:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:17:33 +0000 (16:17 +0000)
am: fbc5716d8b  -s ours

Change-Id: I561e84d85bbd9f7e93e8591355cdb7f2874a7cba


Trivial merge