Merge "NdkMediaFormat.h: Updated to include Android API macros" am: f96e7577a5 am: 9c8463997c am: c904137156

Change-Id: I9aebcd72df1dd04849bfa8dacd97cc6f653a6ca1