Revert "klte: cleaner way of allowing kltedv nfc to function on usnified builds"

This reverts commit 9e2e0ae0c1338e6ad93411255f208434928a46c5.

(cherry picked from commit 688ae1ebff973ceb3bba2e8a7acf9f36e898c708)