Merge "Invoke dex2oat explictly before dalvikvm"