Merge "Improve bad error reporting seen in shamu SELinux boot failures."