Merge "Fix mac sdk build." am: 5d1c45fb50
am: 1306895227

Change-Id: I4af94c974740e0a6ab49c3cc1ac231a9d345569f