Merge remote-tracking branch 'aosp/kitkat-mr2.1-release' into HEAD

Conflicts:
	core/build_id.mk

Change-Id: Ia78dcf47f39a36de1920840d618e5ed9f1272a96
bootzip: fix up issues with bootzip creator

Allow for modules to be a symlink (as seen with qcom wlan)
If the kernel version is blank, call it Slim-*

Change-Id: Id85618437904cb6e2bcb8013f4c50577044ce344
Merge remote-tracking branch 'slim/kk4.4' into kk44s