Merge remote-tracking branch 'AOSP/jb-mr2.0.0-release' into jb-ras-mr2.0
Merge branch 'jb-ras-mr2.0' of https://github.com/rascarlo/android_build into jb-43

Conflicts:
	core/build_id.mk