Merge changes If10189f9,I32dde5a6

* changes:
  ART: Move DexFileStringEquals to DexFile
  ART: Move dex structs into own header