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

Change-Id: I018c396127b0bb68358b74a72ecd33532440df5d