Merge branch 'jb-mr2.0.0-release' of https://android.googlesource.com/platform/build into HEAD

Conflicts:
	core/build_id.mk
Merge tag 'android-4.3_r3.1(JLS36G)