Volume rocker wake and volume rocker music control

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java