Merge "adb: remount for /system as root"