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

Change-Id: I37b740ddf1fe61302707517ec0c31da01af93982