[automerger skipped] Merge "Don't install libGLES_android" am: 9b1e2ad9ff am: 493a3b1835 -s ours am: 06f0a6acd5 -s ours

am skip reason: Change-Id I0339d46d0ac54dc3e5a95db218a44d9f48b0cdd0 with SHA-1 ed554abaeb is in history

Change-Id: Ief156ece6ac87acbe50be9bf74872d8f094cd934