Fix compile with GCC 4.7

Change-Id: I019ff8feb45c8561f19e20da2bd7048a469266f3
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into cm-10.1_mod