Merge "Update OpenSLES_Android.h and OpenSLES_AndroidConfiguration.h for N API"