Merge changes I1c1445ba,Ic0c8b163

* changes:
  Straighten out do_mkdir
  Convert fscrypt_set_directory_policy to C++