Merge "NFC: Move NFC service implementation out of system_server." into gingerbread