Merge "NuPlayer: Use deep buffer AudioTrack for video playback" into oc-dev am: 80158939f9
am: 05d698d950

Change-Id: Idb4339477c1656a87f76a7949b077e0714549e68