Merge "convert java_import jars with arch variants" am: 7a45d37e am: 0050ed27 am: c70a8117

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



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