Merge "NdkMediaCodec: expose surface APIs in manifest"