Merge "Simplify CHA dependency tracking data structure."
am: d8b6461dfd

Change-Id: Ica9ce566d2a5a3256f745bfed5c0af2af09ac687