Includes fixes to clean up our MSVS projects.

BUG=None

Change-Id: Ied16bf5b40e7a29ee08e76152daa1296c8960724
Reviewed-on: https://chromium-review.googlesource.com/278051Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>