Merge changes I5be41da8,Ifa4aac02

* changes:
  ART: Resolve <clinit> strings in compiler driver
  ART: Resolve static field strings in compiler driver