Revert "cleanup common tree"

This reverts commit 45d3f9487bfc59ce9890e73bdd7a8237b57646c0.

Conflicts:
	Android.mk

Change-Id: Ibb571a7cff526b3e1c4d792e57aebd939364747d