unification bits for aosp

Conflicts:
	core/Makefile
Remove extra closing bracket.
Fix Unified code