am 3a632f7d: (-s ours) am 4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."

* commit '3a632f7d3760fbf34dd03f37642562e31abfd468':
  Fix "make acp" under Cygwin. DO NOT MERGE.