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

* commit '34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72':
  Improve bad error reporting seen in shamu SELinux boot failures.