Merge remote-tracking branch 'upstream/kk4.4'

Conflicts:
	tools/buildinfo.sh (reverted from commit f3fc3bf859377748eb07a6235bec77b2af632d42)
Add ro.slim.model for OTA purposes

Change-Id: I5d4baf0548e098d629e900580758a6d582d3cc2b