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

Change-Id: I697d928da4084b3f41574abf0464f6feb9ed03aa