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

Change-Id: I8c91994294829445b9fb71a50f30555d11d407c5