Updates default forms on android to match standard forms
Merge pull request #190 from tomclement/cleanup

Updates default forms on android to match standard forms
merging with upstream changes