The astute among you may have noticed that I in fact sent no patches. This is for two reasons--
1. Google did something behind the scenes and broke git send-email for me again 2. Thanks to Iain Sandoe, the build now completes, and he provided a couple other fixes as well. There are still a couple issues post-build, though, and it makes more sense to work through those before posting a v2.