Merge "Merge libs/ directory of imported aars into classes.jar" am: 7189f5d1...

Merge "Merge libs/ directory of imported aars into classes.jar" am: 7189f5d1 am: 9a203fcd am: b04255fc am: 27bd8fd7

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

Change-Id: Ib3560be5b791421d279b9ef74149d0e06f788e79