Merge "NdkMediaCodec: typedef struct ANativeWindow ANativeWindow" am: 700ba4e8b4
am: 8add7e58e1

Change-Id: I6c1d8f7e10bc217b3a0e81f7c7fa3fc5bd6d5f83