Merge "adbd: fix remount on non-system-as-root devices."