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

Change-Id: Iaff3c28b125081f537277411bfb77fe5246db8df