Use AOSP-S4-KK frameworks/av to avoid reverts