am 42d12816: am b4364ee9: am 52b63e20: Merge "ART: Fix gtests broken by dead block elimination"

* commit '42d12816d65f98c2f9a17acf9ad14faa9e3b5f2b':
  ART: Fix gtests broken by dead block elimination