Merge changes I5e42f85c,I60174623

* changes:
  Keep dex location from OatDexFile.
  Remove unresolved classes from image classes.