am e61fd281: Merge "Remove BlockingMediaPlayer."

* commit 'e61fd281a8cb69ae45c5de4b160ab86226083152':
  Remove BlockingMediaPlayer.