Merge "Hammerhead: NFC: Remove eSE-related config and files"