Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into mr1-gcc4.7

Conflicts:
	core/build_id.mk
	core/tasks/apicheck.mk
	target/product/core.mk