Revert "attempt to fix NFC for i9500"

This reverts commit a6174671f2ee18732cf4613c34f170719e572ffb.

This is not the fix, anyway
Merge remote-tracking branch 'vendor/kitkat-legacy' into remix-legacy