Update to XE16
Modernize the build
Update APK