Merge "Allow ABI dumps to contain ANDROID_BUILD_TOP that is not a path prefix" am: 1a4e4daf49 am: 57d34a4b72

Original change: https://android-review.googlesource.com/c/platform/development/+/2122585

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