am 87ed0a10: Merge "Bug fix on installd with SELinux enabled kernel."

* commit '87ed0a10f5cb563c0a06d22a40472b4e88348e9b':
  Bug fix on installd with SELinux enabled kernel.