Fix brunch command to work for all build variants.
Conflicts:
	envsetup.sh
Merge tag 'android-4.4.4_r1' into HEAD

Conflicts:
	core/build_id.mk
	core/version_defaults.mk