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

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