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

Change-Id: I93aabd59c058669fe04bbad92054cb57d7fc6891