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

Change-Id: I069065dd0660f3824108bd6489b177296781a4b4