Merge branch 'qcril' into cm-10.2

I've merged huge commit and resolved all conflicts -> https://github.com/CyanogenMod/android_frameworks_base/commit/4948cdb6dab9fe726859203b5a6b6bcfff97437e

Without this commit current build (23-10-13) doesn't compile on i9300, throws about 30+ errors.
With this commit build successfully compiles. CM also boots successfully without any FC, so I guess I didn't screw up :+1: 

However please review this commit in case of issues with network indicator.

Like I said Christiano, hope I can help you a bit :). Let me know if you'd like more of these.

~Archi