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

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

Change-Id: I5744d41cd7112987c8c559a40b138741c715b2ad