Merge "Remove x86-only page*.h files."