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

Change-Id: I9fa0b4de3364cccfff80943f8b191dd2c225d525