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