Merge "SELinux policy that separates "init_shell" from "shell"." into jb-mr2-dev