Merge "Undo dex2dex compilation before invoking LoadHook"
am: e2a739acb4

Change-Id: I3f975722e811da45ab3e646d8456a760215ee8f6