Merge "jjb/releng: support multi arch compass images"