Merge "More Mac build fixes."
am: 55d31ecd86

Change-Id: I47f06d215b6cc9e00b21e4f07506d5a5d2d02ec7