Merge "Make OpenSLES_Android.h also include OpenSLES.h" am: 6952bbc508 am: 29862d783a
am: fb124daa45

Change-Id: Ie4a1799f2c67967fee18424a97b0beec8c11955b