Merge "adb: restore generation of public key in `adb keygen`."