Settings: change vibration multiplier (2/2)

Conflicts:
	src/com/android/settings/SoundSettings.java
https://github.com/LiquidSmooth/android_packages_apps_Settings/commit/b5a786f04762171fde960edd6be34a93a7e86c1c

Change-Id: Ib971f1d38aa3e903e792f944ed52dba43da54641
Removed Music FX From sound settings as we access Viper from the main settings menu.

Change-Id: If861322b535c2c26d533c27358e921b0df656ec9
Merge remote-tracking branch 'upstream/kk4.4' into kitkat

Conflicts:
	res/values/bs_strings.xml