cleanup
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp

Conflicts:
	device.mk
	overlay/frameworks/base/core/res/res/values/config.xml
fix for aosp
add twrp recovery fstab
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp