Disable DIAG_CHAR for now @bbelos

Change-Id: I4ddba1c3490ac4c7582c37d11610eaf92e91eec8
Use older wakelock.c

This is not complete, and it might be more
appropriate to fixup the drivers to use the
newer version, but revisit that another time.