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

Change-Id: I9e2acddec99706b3bfe763d85051b0f13e99b363