Merge https://github.com/AOSP-S4-KK/platform_frameworks_av into kk-4.4