unification bits for aosp

Conflicts:
	core/Makefile
3 files changed