Merge "Fix mac build (ldflags -> ldlibs)" am: 1b2f2ee621
am: 808c7351c5

Change-Id: I1ae0648fdf3706260c476a5ac398d7cc05d43e33