am f5410f2b: am 3d32cd93: Revert "Remove /system from the dirs to relabel."

* commit 'f5410f2bde6fd5295cad36e3ba3efba0beb92780':
  Revert "Remove /system from the dirs to relabel."