Merge "Add support for scudo native allocator." am: 8338b11afa
am: 9a3af86f6d

Change-Id: I5c97711f9f4901e6cefd171121cb4662a7951eff