Merge "Allow android_mallopt(M_SET_HEAP_TAGGING_LEVEL) to control scudo heap tagging." am: 935aae907c am: f052569012

Change-Id: I7616e1138cc5bb203a650a9e2845830775f1237a