Merge "ahat: switch to using new dominators API"
am: 06a45b7588

Change-Id: I4f8d86e9004b148c02f6ff68307af816ebb0a614