Merge "adbd: Fix adb remount when switching roots during first-stage init."