Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?" am: 83a0c9c6 am: 9dfd4017 am: c826852a am: c08e6ab9 am: 98d6b077 Change-Id: I0d4664e398350a45cc8a0653e1ef43f7b897773d