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

Change-Id: If2f3723c0e0a85adde821691a3a77a124b9f169b