Port pull request #219 to new repository layout. Adds https on Android to fix #165.