Commit 14ce5ab0b7ae012c6e46511bab399c472eb39eb2

Behdad Esfahbod 2019-12-06T03:54:46

First try at fixing build errors