Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""