Merge "Add NetworkStackTests dependency on libdl_android"