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

Conflicts:
	core/combo/arch/arm/armv7-a-neon.mk