Merge "Revert update of CRT objects." am: 5739413797 am: cd161d9e7f am: 52089f479a

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2055896

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