implement 1% battery on select devices

via ro.product.use_charge_counter=1
Change-Id: Iaed07e682463a6467b1903ab40cf41440334b64b

Conflicts:

	services/jni/com_android_server_BatteryService.cpp
Option to use volume keys to control media volume anytime (2/2)

See Settings part for description

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823