Fix kernel build error

Change-Id: I1191517240ae7bcfb2fcbbffc98e22f28e8fa151
Fix kernel build error
Merge remote-tracking branch 'CM/cm-10.2' into cm-10.2