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

Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	core/build_id.mk

Change-Id: Ia78dcf47f39a36de1920840d618e5ed9f1272a96

Conflicts:
	core/build_id.mk