am e7110ac0: am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."

* commit 'e7110ac09bdc77c4a8f7823aa666c9929a33984c':
  Fix libcutils/dlmalloc_stubs.c build breakage.