Merge "ART: SsaBuilder clean up"