Added apk removal patch for nypon, removed patches for build system