am 65834183: am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do not merge

* commit '65834183bf18a5c03a8d7faf73c2a36fd008c99a':
  back port cc6be0a3: wrap make. do not merge