Merge "Make OpenSLES_Android.h also include OpenSLES.h" am: 6952bbc5 am: 29862d78 am: fb124daa am: 1f2b9f16 am: 70c825cd Change-Id: Ic587d7fd52e18b9a02ea269af13d1771a7a573f6