Merge remote-tracking branch 'upstream/cm-11.0' into pac-4.4

Conflicts:
	core/combo/TARGET_linux-x86.mk
	core/dex_preopt.mk
	core/java.mk
	target/product/core.mk