Nypon:Clean up
More clean up
Merge pull request #1 from AndroidOpenSourceXperia/master

Merge with AOSX