Merge "Fixing the Mac SDK build"
am: 0b66e96da5

Change-Id: I2979bf2260a5e254b6247061baa01d1ae8eb1e9e