Merge "Stamp out some x86/host mode warnings" into dalvik-dev