Merge "Track rename of adbd_system_binaries." am: a9fff2f021

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

Change-Id: Icd0ed4a93ac687f8e6c12a036cfc4a5d6eeeeebb