Merge "Fix "make acp" under Cygwin. DO NOT MERGE."