[automerger skipped] Merge "Add ClasspathElement support" into sc-dev am:...

[automerger skipped] Merge "Add ClasspathElement support" into sc-dev am: 062838fc am: 9d05a689 -s ours

am skip reason: Merged-In I7a4adc67164a46079eb8ec0a17fc755044b4949d with SHA-1 e245b61a is already in history

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

Change-Id: Id4109602b89fec30e8dcbf3d101ca713365b6855