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

Change-Id: Ia10b398b1305bd6d9ae319cd8b929ee546284739