Merge "Convert libGLES_android to Android.bp"
am: e2c9396283

Change-Id: I12db81b790db898ab0adb4aa6c17293961397902