Merge branch 'kitkat-dev' into kitkat-pa

Change-Id: I350b863a2e2b5afdd9d3b3c17f284fc853c305ae
Merge branch 'kitkat-master' of github.com:maddoggin/platform_frameworks_base into kitkat-master