fix i925 compiling

Change-Id: I20678ad210403fc0cbb894fe16ba0edc357020b4
Merge remote-tracking branch 'cyan/cm-10.2' into cm-10.2