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

Change-Id: I31ae7ba23934ff80af30ea6e574a0b84ad90efb3