Merge changes I38b16291,I159669ec

* changes:
  ART: Remove old code
  ART: Move read barrier config out of globals