Cleanup: Use only one method to shut down the service instead of two.

Also make sure to release the audio focus when removing the notification
due to being idle in order to remove the play controls from the
lockscreen.

Change-Id: I323db520ce107235ebe774109d0a3338688328b4
Add some (optional) debug logging to the player service.

Change-Id: I2f5aa9d0f799395b967906c9fc9677a80ab18e8f
Merge "Cleanup: Use only one method to shut down the service instead of two." into cm-10.1
Merge "Add some (optional) debug logging to the player service." into cm-10.1
merge CyanogenMod

Change-Id: I1e86899bc218a200d3790c74f195d047defc62da