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

* commit '03a034010ee73e490766cd865f2c12126af63774':
  Add base/memory.h.