Merge "ART: Update CFG dumper to handle extended better"