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

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



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