tree 0b12b49855cb2be05ac831574d227cdae3bab242
parent 64673e14ccdbfebfc971e304d5b67096c2e3d58a
parent 808c7351c59f84b7109c95ae4e7d13c7e583352a
author Dan Willemsen <dwillemsen@google.com> 1523435221 -0700
committer android-build-merger <android-build-merger@google.com> 1523435221 -0700

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

Change-Id: I1ae0648fdf3706260c476a5ac398d7cc05d43e33