Re-apply "shinano: Add NCI HAL module name to libnfc-brcm.conf"

* Add it to the z3 devices too
* TODO: Move this to device

(cherry picked from commit 8a0a769e573b53d2703c7eced7bfb487e6e1f48d)

Change-Id: Id1d8a645ff09c877fea48fd5c84baf2d37336258