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

Change-Id: I4e47d2f4e73a9a2244277b6fbbdcbe4c7f66a5c7