Merge changes I9761298a,I8d3312b2

* changes:
  adb: fix public key authorization.
  adb: add support for vendor key directories.