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

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



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