Include Volume-Rocker support in base framework
Merge remote-tracking branch 'pabx/jb42' into jellybean

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java