Merge "stagefright: prevent more crashes in ACodec" into mnc-dev