Features/1025 fdroid

Fixes #1025 to get FDroid support 
Cleans up versionName and versionCode inlining for #1016