Merge \"Using requested video scaling mode in NuPlayer\" into nyc-mr1-dev
am: 85eb70d63f

Change-Id: I04202efa156b9e1cdc27e288cc7fc3bf199b3152