Merge "remount: Fix failure for system-as-root"