Merge "adbd: fix check of `remount -R`."