Merge "Remove bogus "arch-p" directory."