Merge "x86 interpreter fix" into dalvik-dev