am 161a7d91: Merge "Re-create build directory if using existing one fails"

* commit '161a7d91069ee940becd1589e3e9f95802cab4ec':
  Re-create build directory if using existing one fails