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

Change-Id: I5a2da2aa58af9399208c48df396f856e97b88368