Merge "Sync libnfc-brcm.conf with latest release 4.4 release" into cm-11.0