cLock: Remove redundant code and cleanup, bump version

- This commit removes some seemingly redundant code in the preference
  headeradapter.
- Since lots of things have been changed in cLock since the first version
  was merged, time for a version bump.

Change-Id: I335516c60ec4506447a175d7fab3babd6b7dc9a1