Merge "Rebuild the x86-atom interpreter." into dalvik-dev