Summary of changes: a40e40d... change path on vendor, so our debuginfo are not conflicting (*) 4049412... Now use correct paths with correct macro. (*) (*) This commit already existed in another branch; no separate mail sent