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

Change-Id: I94048b15168627233b101a0790d8c3a5e893fb7c