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

Change-Id: Id01aec0b604a329a0187bd41690e765eb411fec6