Merge "NuPlayer2: Call video flush on audio teardown"
am: bf430563f8

Change-Id: I7c83aed564ac4bb5b4e4a006958ceb87d198a32d