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

[automerger skipped] Merge "Add ClasspathElement support" into sc-dev am: 062838fc am: 952cf37a -s ours am: e3c82015 -s ours

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

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

Change-Id: I7657726a9f52de889674a981cd7b9691bf74962b