merge ktoon selinux

Change-Id: Ifa276467ee20fb94aca4444188266a82485af606