Merge "NdkMediaCodec: fix AMediaCodec_configure to keep input format constant."