Merge "Revert "Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?""" am: d78626f7 am: b3dd969b am: 350c1480 Change-Id: I02491e2818dae5b1250dd4efb67f84975620e7f4