Bringing latest Android code over for 3.0
Merge pull request #29 from bhariharan/unstable

Bringing latest Android code over for 3.0