am 29ec2842: am ec70a0bd: am da0b6b64: am 616b95d2: Fix buildDir issue

* commit '29ec28421ae28e1f3912640289688bb9cfa2fe9d':
  Fix buildDir issue