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

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



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