Merge "Track the symlink /root/adb_keys in the build system properly" into main