am 29309af4: am dd24fcf3: Merge "Revert "ART: Remove wrong DCHECK""

* commit '29309af4e6180b876712c00633596bc40b52cfce':
  Revert "ART: Remove wrong DCHECK"