merge in klp-release history after reset to klp-dev
"KRT16N"
KRT16O
cm: Fix global selinux policy inclusion

We're adding CM-specific policies to an overlay instead of patching
external/sepolicy, so we need to make sure it's included to prevent
misbehaving systems

Change-Id: I7989a1093f9abc8360d492e73a860eb4afad10ad

Conflicts:

	core/config.mk
Remove HomeSample from builds

As good as it looks, we already have a launcher (Launcher3)

Change-Id: I87cac70eec30fd62d6f7ecb7777caa9d240fe0ee
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

Conflicts:

	tools/releasetools/edify_generator.py
Make reposync use -c by default, and use more jobs

Change-Id: Ic4ebc4a63efb13e67d475b7c10aec35620484d2b
Merge branch 'aosp4.4_r1.1' into HEAD
forall_vanir: handle lines that are completely commented out all smart-like

Change-Id: I4c95246831f1ff28e03b615f19ecd5a266effeae
bottleservice: Correct detection of re-lunch condition

Change-Id: Ibc5c3bf9c7d91bb53ceb417d60c76012fdea5887
bottleservice: don't print stuff for devices that probably don't exist

Change-Id: I8e39fd3832df816918e08af1c30aa44ac957d342
bottleservice: Recheck if a duplicate path is removed

Change-Id: I240dc6a6a3afabfbeebe43b38795e67d32aae691
Update ota from target files

Change-Id: I2185926bd7ae47f038b13b3f71de415faa9d0ddf
Reconcile some things.

Change-Id: Ia5a9d007014401283fc1d181b9dcbee356320d34