merging from upstream
Merge branch 'kk4.4' of github.com:cmbroms/android_frameworks_base into kk4.4
testing merge script