Port pull request #219 to new repository layout. Adds https on Android to fix #165.
Merge pull request #405 from manderson23/master

https for Android