Merge "stagefright: ACodec: remove infinite loops" into nyc-dev