Merge "Clarify multiarch warnings"