Revert "d2: fix wpa/wpa2 tethering"

This reverts commit 2590ca0e885c3b3956dfd6b9725fd04b48f0a374.

This breaks wifi on the ApexQ.
add second half of camera fix from https://github.com/invisiblek/linux-msm-d2/commit/c14d261cd064c19dc8d06e

Change-Id: I01604144cd77ae44a4faf6682ade4ea15cb7abe0