Merge \"NuPlayer: adjust temporal-layers to achieve smooth play\" into nyc-mr1-dev
am: 412bfccc79

Change-Id: If911a557ce1e53d10061b0d635553fc8556171c9