Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev