Settings: Forward Port Volume Long Press Skip Tracks (2/2)

Bring Forward Volume Rocker Track Change

Requires Framework Change
http://review.cyanogenmod.org/#/c/82221/ (MERGED)

Change-Id: Ifa3d0987a0d54afd1f56e1d4a7488f428338c757
Cleanup button wake settings (1/2)

Change-Id: I972251384eee15cf9e4915cd82d189ed7ef3050d
Revert "Add changes to buttonSettings.java for"

This reverts commit 24f897acfd5f1bf76b1525bb15fe823a5662952d.

Conflicts:
	src/com/android/settings/ButtonSettings.java
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	res/xml/button_settings.xml