Merge pull request #379 from Hashcode/cm-11.0

hltevzw: fix to the fix for the sensor fix
hltevzw: add stock libnfc props