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

Change-Id: I4c1f8cf10cd6bbc555d6b453f2555c284ebc5eda