Merge "x86-mterp bug fix; support host mode in tests" into dalvik-dev