am caabca37: am 5caca89c: Merge "Clarify multiarch warnings"

* commit 'caabca3786e105abb88728b4d5c4c1436be66ba3':
  Clarify multiarch warnings