Fix kernel build error

Change-Id: I1191517240ae7bcfb2fcbbffc98e22f28e8fa151
Merge branch 'cyanogenmod' into cm-10.2