am d43f160d: Merge "Revert "ART: Workaround for b/20019689""

* commit 'd43f160dc294655885a2c273307d34585c4ce97b':
  Revert "ART: Workaround for b/20019689"