crespo: Fix 4 section mismatches

Change-Id: I378fbbccdd490474867ecca30a7e8353582cbd6a
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2-samsung-3.0