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

Change-Id: I3b5a63825217ec0e387f58d807809ef978b413a1