Merge "NuPlayer: Call video flush on audio teardown" am: d093917344
am: 436d9e9d91

Change-Id: Iab496f913d308599ffc946672a90689274a06ac5