Merge "Simplify CHA dependency tracking data structure." am: d8b6461d am: 1a2c4615 am: f803ace0 am: d51dfde7 Change-Id: Iad4999c6455f1a401352505b25fdc3765fb14b51