Merge remote-tracking branch 'upstream/kk4.4' into kk4.4
Merge branch 'kk4.4' of https://github.com/jsnmarek/frameworks_base into kk4.4