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

Change-Id: I357f55c54594fd88f3e29b264e8dac2c5ccb1dc8