Merge branch 'cm-10.2' of github.com:vbdetlevvb/msm7x30-3.4.x-nAa into cm-10.2