Add more patches to build on intel mac. Our clang version is reporting some errors. Bug: 271115733 Test: N/A Change-Id: Ib0166d0131937421d6ce2141e94d0b2f1c581a4d