serrano: NFC config update from NH5

Change-Id: Idaf1b4c3763c3e25e2431aae959dd94a551c4f28
Merge branch 'cm-11.0' into kk_mkt