merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	config/common.mk

Change-Id: I1163d322ed725be1e2288bea18a553cef0462075