Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev