Merge branch 'kitkat-mr1.1-release' of https://android.googlesource.com/platform/build into kitkat

Change-Id: Ib8998aa3704758ab070d8bd97d6713c06fac4aba
Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE

This modifies buildinfo.sh to not set model, name, description, and
fingerprint in build.prop. These can then be set via custom init
lib.
This also fixes ota_from_target_files to function without these
props being preset.

Change-Id: I945b2c38e60b207d2d0f82b34f4f230ac21b0657

Conflicts:
	core/Makefile
	tools/releasetools/ota_from_target_files
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy
roomservice: Fix handling of devices with _ in their name

Currently, roomservice takes every _ in the device tree name and
replaces it with /

Instead, strip the device name (such as pollux_windy) from the repo
name before replacing _ with / and then append it again when we're done

Change-Id: Ieabe85ecd8829c959a7296e5cd73f577879c4ffc

Conflicts:
	tools/roomservice.py
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy
Merge remote-tracking branch 'build/kitkat-legacy' into remix-legacy