Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68
am: 070e341303

Change-Id: I332a55c4a28c1b94610270c4658460562bd4bef3