Merge branch 'cr-4.4' of https://github.com/cristianomatos/android_frameworks_base into cm-11.0