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

Change-Id: I47c0a749c2e133578d8e00d871f7b6f6aca023af