WiFi AP code cleanup derp fix

Change-Id: If3e0a0905cdc8634dfd2759f69552badafa141b3
Merge "WiFi AP code cleanup derp fix" into kitkat-caf