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

Change-Id: Ic23c6526a63f1bd101cf361278813a02d16f481a