Merge "Invoke dex2oat explictly before dalvikvm" am: 77ced6adfd
am: b618586399

Change-Id: I695ae1237d5206e441d82cf48d95ca74d2a70b2a