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

Change-Id: I05b1a13a2a06fd23e13bfac1316d2683cd539a5a