Merge "Revert "first_stage_mount: Bind mount /system after switch root""