Bacon - Remove NFC module suffix

Original_Change-Id: Ie94dfcf6bbb57c86593201bd49992c048791c897

Change-Id: I707a8801e8edc76927aafb21156fd9a188703deb
Signed-off-by: STELIX <ssspinni@gmail.com>