General code cleanup
Upgrade AwesomePlayer from CyanogenMod