am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."

* commit '48ba758782bed8c50f450fd77c4b3284c3fa7316':
  Improve bad error reporting seen in shamu SELinux boot failures.