Merge "ART: Fix gtests broken by dead block elimination"