Merge remote-tracking branch 'aosp/kitkat-mr1-release' into kitkat
Signed-off-by: David Viteri <davidteri91@gmail.com>

Conflicts:
core/build_id.mk
tools/releasetools/ota_from_target_files

Change-Id: I4bfd443c865a2253419f473e0b4cddb6555f1e25