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

Change-Id: I0bb1e8cb24ce75138cab7838f794f1ca2b4f7fe1