Merge "Correct abspath implementation" am: 9ec1a7aa am: fcae811f

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



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