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

Change-Id: I04db8eae029ec6dbb4f583974d21c5f1ed4b3a5e