Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev