am 201f36d2: Merge "Don\'t expose non-standard basename_r and dirname_r in LP64."

* commit '201f36d23bb778b29c8d305fa40a41990e0487bc':
  Don't expose non-standard basename_r and dirname_r in LP64.