am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev

* commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98':
  Remove /system from the dirs to relabel.