Merge tag 'android-4.3.1_r1' of https://android.googlesource.com/platform/build into jb-43

Android 4.3.1 Release 1

Conflicts:
	core/build_id.mk
Merge branch 'jb-ras-mr2.0' of https://github.com/rascarlo/android_build into jb-43

Conflicts:
	core/build_id.mk