Merge "Fix api fingerprinting with apex." am: 04af019e am: ccd6dc49 am:...

Merge "Fix api fingerprinting with apex." am: 04af019e am: ccd6dc49 am: 59e10ef9 am: def5977a

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



Change-Id: Iaa4f54778df7cfc96ac5610218b0268b4bfff8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>