Merge "Move common arch-* code to arch-common directory"