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

Change-Id: Icced78d226f61fba90e1c8f5304bbf838d40906c