Merge changes If9d1da45,I6daecb52

* changes:
  Do not test class unloading in 626-const-class-linking
  Fix 626-const-class-linking for no-dex2oat configuration.