Merge "NdkMediaFormat.h: Updated to include Android API macros"