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

# Via Android Git Automerger (1) and others
* commit '7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4':
  Fix valgrind build.