Merge "NuPlayer: Use deep buffer AudioTrack for video playback" into oc-dev