Merge "Correct paths for abi prebuilts." am: e4c493a3

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



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