KVT49I
.1 becomes .2

Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
KVT49K
"KVT49L"
Merge remote-tracking branch 'aosp/kitkat-mr1.1-release' into HEAD

Change-Id: Ice2071e60ec88b49d6f6640bbd6c20bc2af8bda4
Allow override of device asserts, including multi-device support.

Set in board file with TARGET_OTA_ASSERT_DEVICE.
(cherry-picked from commit 0f452f21fc9323b9d1fe746161761cf40aaa5030)

Change-Id: I3d06bdc0e3e26bde0c0e646accd050364f9713b9

Conflicts:
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files

Change-Id: I3d06bdc0e3e26bde0c0e646accd050364f9713b9
Merge commit 'refs/changes/95/3195/2' of https://gerrit.slimroms.net/SlimRoms/android_build into gzroms