Merge "Fix misuse of ALLOC_DONT_TRACK." into froyo