Merge "Clean up arch.mk, only define really board-specific things here"