Merge "Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68 am: 070e341303" into qt-dev-plus-aosp
am: 074053853c

Change-Id: I23e1fc7abd34350389ddbe6a50c5d5bb7be44838