Merge "fs_mgr: harden adb-remount-test.sh"