Fix for e970 NFC firmware load problem.

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