Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev