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

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