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

Change-Id: I0a1463180019960e92fbd3c06befcdc3c182f261