am 334c04e2: am bb1a6244: Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev

* commit '334c04e2f0eb62c6c9db73da0ec0021abffceb92':
  Fix an NPE and fd leak in SELinux policy updater.