BSP fix
Merge branch 'cm-10.2' of https://github.com/cm4cm/android_device_cherrymobile_flare2x into cm-10.2