Revert "Added wakelock short circuiting to allow wifi to sleep"

This reverts commit 2d5302d128f9875b1780c23b95754fc44826a19a.

This should no longer be needed with the latest ath6kl wifi driver
(CMTP v4.5) and how it handles WOW.
Merge "Revert "Added wakelock short circuiting to allow wifi to sleep"" into ics