Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?"

This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and
af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned.

Bug: http://b/64543673
Test: manual + treehugger
199 files changed