Merge "Use abspath to dereference $BUILD_BASE" into integration