Merge "stagefright: set scaling mode for blank frames in ACodec"