am 33c4578b: Merge "Use SRCDIR as a working directory"

* commit '33c4578b5f2fe9a7ba058d704c1f47690783ee63':
  Use SRCDIR as a working directory