Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Change-Id: I9b9a0199268de579a9f236ea7b813fb718d286db