Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am: 4710431

* commit '4710431dc4751e9674b9e2e620f425603cf24643':
  clarify MediaCodec.setVideoScalingMode behavior

Change-Id: Ia32689d261315c1030ab66bb0870768aae2835cd