Merge "SELinux test accounting for nonplat -> vendor." into pi-dev