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