Merge "BuildSystem: Avoid $EUID and use id -u instead."