Merge tag 'android-4.3_r3' into HEAD

Android 4.3 release 3.0

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	core/build_id.mk

Change-Id: I30a8d02c22a4fb02f10b2b238129d94d706fce22

Conflicts:

	core/build_id.mk