Merge "NdkMediaCodec: typedef struct ANativeWindow ANativeWindow"