Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-11.0

Conflicts:
	res/layout/incall_screen.xml
	res/values/colors.xml
	src/com/android/incallui/CallButtonFragment.java

(cherry picked from commit 5229e6e1b650dbcccd2466c17a7b730e37cb59cf)