Merge "NdkMediaCodec: Wrong check in error callback handler" am: 49a4f52e02 am: 8155143547 am: a001e57f7d
am: 59244b5bde

Change-Id: I263b72b11799b446a29b0bb63e5d5ba523a3fc0c