merge in klp-release history after reset to klp-dev
"KRT16N"
KRT16O
build: edify: fix multiple device assert

Only generate one error message since multiple error message
will trigger a fail if the device does not match the first
assert

Change-Id: I1dc47cce10032eb28bbb808482b5ee9efc3b87bc
KRT16P
KRT16Q
"KRT16R"
merge in klp-release history after reset to klp-dev
"KRT16S"
Merge tag 'android-4.4_r1.2' into cm-11.0

Android 4.4 Release 1.2
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0