Fix SDK build

Adjust PRODUCT_PACKAGES and PRODUCT_COPY_FILES to fix the following SDK
build.

$ . build/envsetup.sh
$ lunch sdk-eng
$ make sdk

Change-Id: I299e97b7935f9eb01820497342675cfd7ef794e9
build: fix bash completion sourcing

Sourcing functions in files from a function within a file being
sourced was giving bash a hard time. This fixes 'repo' command tab
completions.

Change-Id: Iac1b3078e20749fb474ed1270e0886cf435e24d9
Merge "Fix SDK build" into cm-10.2
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_build into cd-4.3

Conflicts:
	envsetup.sh