Merge "Load legacy NFC libhardware HAL by correct name."
am: 9e172b30c7

Change-Id: Ia4616cd1ba65cd390a284cfb207604d31768d7bd