Bringing in the latest Android code
Remove warnings
Merge pull request #23 from bhariharan/unstable

Bringing in the latest Android code