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

Change-Id: Ifaa0d70091189374c2294d021ede28d8786b5710