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

Change-Id: Ib1c2c02e95a300202eac7659dbb41958e0cfdbca