Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-dev