Merge branch 'cm-10.1' of github.com:DerTeufel/android_build into cm-10.2