Merge "stagefright: Return error for wrong buffer index in MediaCodec"