Merge \"Using requested video scaling mode in NuPlayer\"
am: 42cf4c39dc

Change-Id: I3fa1f06ba5a492019371e43dd08f38ffa24aafca