Merge "Use RELATIVE_PWD to ensure that we get consistent debug paths."