Merge "Dalvik SMP update" into dalvik-dev