Merge "Revert "Invoke dex2oat explictly before dalvikvm""
am: 75be076511

Change-Id: I40d7f7b443408716de3bb04f39587b39d39c0728