Merge "Adds a null check in NuPlayer::closeAudioSink."
am: 54b00e6d06

Change-Id: Ic2563f751d590fd243549768ff07f4ded0867027