am 616b95d2: Fix buildDir issue

* commit '616b95d231e53cde9c6db0fd98908339a35ca322':
  Fix buildDir issue