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

Change-Id: I1c2a9dfe36fdd47c81b7e405adb60383e6257a1c