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

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