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

Change-Id: I74631d77b453484aabd5e52efe1e4abbcc6ac5df