Revert "Use AOSP-S4-KK frameworks_base"