Merge pull request #640 from bhariharan/master

Adding upgrade steps for Android native
Adding hybrid upgrade steps for Android