Merge "Utilize from text core platform api surface jar in build" am: b4207052 am: 38c5c6e4

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



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