Merge "hv: Initialize adb with client support only when necessary"