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

Change-Id: I4102013c5b43c471b9475156aae7bea88bf0bd53