am 486b8de7: am 03a03401: Merge "Add base/memory.h."

* commit '486b8de7e0a101f7c99f7fd7a92a4562e7745967':
  Add base/memory.h.