MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE

Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
"KTU84P"
Merge remote-tracking branch 'aosp/kitkat-mr2.1-release' into HEAD

Conflicts:
	core/build_id.mk

Change-Id: Ia78dcf47f39a36de1920840d618e5ed9f1272a96
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4-mo4