Merge "Use SRCDIR as a working directory"