Merge "Fix some x86 portable asm." into dalvik-dev