Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?" am: 83a0c9c65a am: 9dfd4017ad
am: c826852a83

Change-Id: Ie6768eaa734a8468c17d4ca9e3a11369500a633b