Board Config changes for NFC, GPS, matching CAF

Change-Id: I35135f06a5404ead0ba3213dafde956f6e9b0995