Reworked build files
Now making MMB bacon ;D
Merge branch 'aosp-ics' of ssh://github.com/MoltenMotherBoard/android_build into aosp-ics

Conflicts:
	core/Makefile
	tools/cm/opticharger