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

Change-Id: I6b584b9ae601206f0d481f391117dee8a4bafd57