Merge branch 'kitkat' of github.com:AOKP/frameworks_base into kitkat