Merge "Update apr-util Windows project for renamed dep paths." into jumper