Merge "Fix running with DlMalloc instead of RosAlloc."