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

Change-Id: I134f7388ec351d3f4b357e9bb3dba08b1c6d9db4