Merge "Fixing the Mac SDK build" am: 0b66e96da5 am: f13b38ca72
am: 83f035df3e

Change-Id: I89f30209dff6c079dcd042585c8d7fa2adf34fa3