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

Change-Id: I70b9a6ee90d57c8d4085f45bfc7ddf0e3cf711fa