Merge "adb: don't require adb keys to be named "*.adb_key"."