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

Change-Id: Ibb9b6266df12729f192514b75a9b57bbf1a7f862