am 340d6be0: am a703a728: Merge "ART: Workaround for b/20019689"

* commit '340d6be04fe5b3c9eb8f2964a38978b74dd535ca':
  ART: Workaround for b/20019689