[automerger skipped] Merge "Use stem when filtering boot jars." am: 4e0c1d37...

[automerger skipped] Merge "Use stem when filtering boot jars." am: 4e0c1d37 am: 314b2c5a -s ours

am skip reason: Merged-In Ic519ffa0c5b616abddf15b41c934421dfac2e78a with SHA-1 07753d84 is already in history

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

Change-Id: Ibf64a3ac0f6801752bac919e55575d4daa6fbe49