Merge "Revert "Enable the scudo native allocator."" am: c8226ec23d am: 0bce21480c

Change-Id: I10023e34bbcebb0ce0c54e672e567c118a1b46d6