Merge "Revert "Invoke dex2oat explictly before dalvikvm""