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

Change-Id: Ieb5b8e7dffec36cb37866cb4a745fd4293e44a95