Merge "Wifi supplicant test statically links to dependencies." into oc-mr1-dev am: c0d5b9bbb8
am: 4fdb18759b

Change-Id: I93781a9ccacfb1dde369dbf429126c55fcf2e851