merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	config/common.mk

Change-Id: I0e0a138b369690a5e96fd83906a963793e7b8515
cm: Remove $TERM in global envrionment

 * Handled by mksh now.

Change-Id: I21aaa17580e69ab81c471939aa7f968ad7475cb4
merge changes from CyanogenMod 10.2 into local branch