Fix for APK splits

Fixes #76