Merge "Fix api_fingerprint.txt generation" am: 404adeefdc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied96fa5c9dcb848d1c9087a888907b263a4afbf7