Merge "Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 17 May 2016 16:13:54 +0000 (16:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 16:13:54 +0000 (16:13 +0000)

Trivial merge