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

Change-Id: I903a1b4be2beabe666964ac96918b98c6f0489a8