Merge "adb: increase `adb [un]root` timeout."