am d93eec66: am 71a1f3c9: (-s ours) am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev

* commit 'd93eec665f7c8dbc245bd147c9fcfea4ed11cbca':