am 03491484: am a26b2617: Fix buildDir issue.

* commit '03491484367f61812538fd5f3c294c80cd85cd70':