Merge "Fix eglBindAPI negative test" into nougat-cts-dev