Merge "Don't install libGLES_android" am: 9b1e2ad9ff

Change-Id: I2ec92c339ea169057b2197cf2c5ec216342efa0c