Merge "Re-root and use device remount APIs for SystemPreparer" into tm-dev