Merge "Update OpenSLES_Android.h for API 20"