Merge "Update OpenSLES_Android.h and OpenSLES_AndroidConfiguration.h for N API" into ndk-r12-release