Merge "adb: add "adb unroot" to restart adb in non-root mode"