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

Change-Id: Ib523ce5acae56fa834da438e14f71ba54d8e5ed5