Merge "adb: don't require adb keys to be named "*.adb_key"." am: 37883718a9 am: ffb0576c7b am: 747049e527
am: 8a98ad9cfe

Change-Id: I8e69e2b4dedf5bded1714fe9492ed3789e112eb1