Merge pull request #394 from bhariharan/unstable

Clean up Android lib proj build paths
Unified all API version strings to one place in Java and one place in XML