Merge "Modify Soong to utilize from-text android.jar in build" am: bc2906efef

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

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