am 0cf93dc3: Merge "Write mkdirs in more idiomatic C++ style."

* commit '0cf93dc345cd5e8131009146a3b2767b1c60f77b':
  Write mkdirs in more idiomatic C++ style.