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

Change-Id: Iad4999c6455f1a401352505b25fdc3765fb14b51