Merge pull request #1 from AndroidOpenSourceXperia/kitkat

:)
Merge pull request #2 from AndroidOpenSourceXperia/kk-dev

Merge pull request #1 from AndroidOpenSourceXperia/kitkat