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

Conflicts:
	core/generate_extra_images.mk