Merge pull request #26 from bhariharan/unstable

Updating Android source files
Grabbing the latest from unstable