Merge changes I39354837,Id8e47f45

* changes:
  Change ClassFileLoadHook to lazily compute dex file
  Remove unneeded mutator_lock_ requires from fixed_up_dex_file