Address some post-commit review comments on r217261

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217276 91177308-0d34-0410-b5e6-96231b3b80d8
Merge branch 'upstream'

Conflicts:
	src/memory.cpp