Merge changes Ia9960af9,I6987d60c into oc-dev

* changes:
  NFC HAL no longer violates socket access restrictions
  Remove access to sock_file for hal_nfc