Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Change-Id: Ie4ad0f5e2785df0f5083e1bc93951ce389b293e5
(cherry picked from commit cf33c013316076b4d5d94a132e2620eb2a2a50fe)

Conflicts:
	core/build_id.mk
Merge tag 'android-4.4.3_r1.1' into HEAD

Android 4.4.3 release 1.1

Change-Id: I814a785dd9e199c1d1168fea761a20ddc897904a
(cherry picked from commit 5bd01da183fb96963c5947db36c8e82c8c8aee7d)