Merge "Fix up dex cache strings stored in classes"
am: 85db315a42

* commit '85db315a4245666be0d0dfafa46818b404a7b8b2':
  Fix up dex cache strings stored in classes