Merge "Revert "build/tools.atree: Move x86-specific changes to tools.x86.atree""