Merge commit '4a0eb239e802bc20c2d2101217170879440b8e99' into HEAD

Change-Id: I9a32a731651ee6d02e347c7aef3b68d609710561

Conflicts:
	self-extractors/nvidia/staging/keymaster/Android.mk
	self-extractors/nxp/LICENSE
	vendorsetup.sh
Merge commit 'e39a27e' into HEAD

Signed-off-by: Sean Hoyt <seanhoyt963@gmail.com>

Conflicts:
	BoardConfigCommon.mk
	kernel

Change-Id: I5724ee212f8ef185430fb01e63fb446b3d459f58

Conflicts:
	BoardConfigCommon.mk
update fingerprint to KRT16S