envsetup: Export ANDROID_BUILD_TOP

and revert addaosp change

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>

Conflicts:
	envsetup.sh