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

Change-Id: I411b36b58fa9fe343d74fc215d4c62114efe111c