selinux: Fix up device-specific policies

Change-Id: I095b42605c0907cde080452c52caa4cc283313ef
Merge branch 'remote' into mkl