Merge "Fix sdk-mac build."
am: 49edd88601

Change-Id: I1b32711fd89875307617eff8a893a21f3996270c