Merge "fs_mgr: Harden adb-remount-test.sh on read-only filesystem"