Merge "Revert^2 "Use soong built autogenerated RROs"" into main am: 4d72d3e3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3390619



Change-Id: I07fbb67a110f95277632e00a559100f78e05dbed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>