Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f am: 028fd7a25f am: 3261cbcf9b

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: I2d563e13505a47b209e742709ead2fdbeeb8fc96