Fix build for cm-10.2

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