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

* commit '4ebdc93f6039b5429c8bbff74373657de6be02b8':
  Clarify multiarch warnings