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

Change-Id: I38a366d252d61e02e2093cfded29df78633d4448