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

Change-Id: Ib4afd31916376cd9dca645ea5b0e56cd65cac290