Merge "Don't expose non-standard basename_r and dirname_r in LP64." into lmp-dev