am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"

* commit '342a2ae9f28849f6c388faf3f289b64c4bbbb0b3':
  Fix OpenSLES_AndroidConfiguration.h to be usable for C code