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

Change-Id: I7e30ff76f614ea84be61a56b8b54d5b22d58403e