Merge \\"Also compile libnetd_client for target testing.\\" am: 2b87a47c09
am: 19a8a949b3

Change-Id: I369c3f760740786e41097a0d2e93816ed78e7a0a