Merge "ahat: switch to using new dominators API"