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

Change-Id: I85971d6fea543156667f6d5d04176396c531759f