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

* commit 'a703a7280a5081dd4e6f7e0d3860748f8a29965e':
  ART: Workaround for b/20019689