Cleanup and rebuild apk