Update
Merge branch 'kk-asylum' of https://github.com/bangsti/android_frameworks_base into kk-asylum