Revert "releasetools: Move packages into extras"

This reverts commit 78a0b87df3cd7e25bed94d8dacfb4bc25bafebef.

Conflicts:
	core/Makefile
	tools/releasetools/ota_from_target_files
Use BUILD_USER_ID for jenkins build

original from androidarmv6