gp2a_proximity: readded wakelock is necessary to avoid problems with answer calls
and some cleanups
Revert "ariesve:update defconfig"

This reverts commit 85432d93e8e7197f4ba114815e96832e55cb9776.