Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into ics

Conflicts:
	config/common.mk

Change-Id: I6a26a57eda383ffdb51bfe89d4f5ea5dc7602bac