Merge "Write ADB keys to adb_keys as well for backwards compat"