Merge "Allow ABI dumps to contain ANDROID_BUILD_TOP that is not a path prefix"