Merge "Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:17:44 +0000 (17:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:17:44 +0000 (17:17 +0000)

Trivial merge