Merge "Track rename of adbd_system_binaries. am: 4473e1689f am: 08829ec180" into rvc-d1-dev-plus-aosp