Merge tag 'android-4.3_r2.2' into jb3

Android 4.3 release 2.2
Merge tag 'android-4.3_r3' into jb3

Android 4.3 release 3.0

Conflicts:
	core/build_id.mk
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/build into jb3

Android 4.3 Release 3.1