Revert "Merge branch 'kk-caf' of github.com:BrokenOs/frameworks_base into kk-caf"

This reverts commit ba253eb2fee7b8470c33efc63b0417b30a973071, reversing
changes made to f0b3c45e4d550471a54c6272ac6754ddf8951123.