Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"