am d260be38: resolved conflicts for merge of 486645ee to mnc-dr-dev-plus-aosp

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