am a422266b: am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev

* commit 'a422266b1c66e9fa37fbfcf22f273aaa99f16f00':
  Fix signing process for SELinux file_contexts