Merge "Remove dead dlmalloc stubs." am: 2736aec411
am: 3f958ed641

Change-Id: Icd6df972b4e15bd5badc45442e06298214584586