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

(cherry picked from commit e5b4fbbca3ebf51be25c00e1117f4c0e554a6ccc)

Conflicts:
	core/Makefile