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

* commit '9016d0aef415e00df636b6407a05e5e08e430ed8':
  Fix signing process for SELinux file_contexts