Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:42:14 +0000 (20:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:42:14 +0000 (20:42 +0000)

Trivial merge