Squash 4.3 changes.

PS2
  Fix derp
PS3
  Fix another derp
PS4
  Update roomservice

Conflicts:
	CleanSpec.mk
	core/Makefile
	core/base_rules.mk
	core/build_id.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/TARGET_linux-mips.mk
	core/combo/arch/arm/armv7-a.mk
	core/definitions.mk
	core/droiddoc.mk
	core/dumpvar.mk
	core/java_library.mk
	core/pathmap.mk
	core/tasks/apicheck.mk
	core/version_defaults.mk
	target/product/full_base_telephony.mk
	target/product/generic_no_telephony.mk
	target/product/large_emu_hw.mk
	target/product/sdk.mk
	tools/droiddoc/templates-sdk/components/masthead.cs
	tools/droiddoc/templates-sdk/customizations.cs
	tools/releasetools/build_image.py
	tools/releasetools/common.py
	envsetup.sh
	target/product/languages_full.mk
	tools/droiddoc/templates-ds/assets/css/default.css
	tools/droiddoc/templates-sdk/assets/css/default.css
	tools/droiddoc/templates-sdk/assets/js/docs.js
	tools/droiddoc/templates-sdk/components/masthead.cs
	tools/droiddoc/templates-sdk/customizations.cs
	tools/droiddoc/templates-sdk/docpage.cs
	tools/droiddoc/templates-sdk/head_tag.cs
	tools/droiddoc/templates-sdk/sdkpage.cs

Change-Id: Iec6276b81a316b1c103d0f86e472674a35340851

Conflicts:

	tools/roomservice.py