Merge "Simplify CHA dependency tracking data structure."