am 5821e11d: am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."

# Via Android Git Automerger (2) and others
* commit '5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8':
  Fix valgrind build.