Merge "third_party/nxp: use /data/vendor/ese not /data/nfc"
am: 2128ea3e1d

Change-Id: I13364a7f25adeaafe3c6adc2ce8df09738b0f313