Merge "adb: stop using adbkey.pub." am: fa105049d8
am: d78cbabf5d

Change-Id: Ib1b358c09f40b7c2419fe89ef0de83e6355c76a0