Make change and version bump to SP1A.210721.001

Change-Id: I29a84b22f25b5f06199f922eeaad1678e0f58605

core/Makefile

@@ -4230,7 +4230,7 @@ else
   ifeq ($(TARGET_PRODUCT),sdk)
     build_ota_package := false
   endif
-  # A target without a kernel or recovery fstab may be one of the following:
+  # A target without a kernel may be one of the following:
   # - A generic target. In this case, the OTA package usually isn't built.
   #   PRODUCT_BUILD_GENERIC_OTA_PACKAGE may be set to true to force OTA package
   #   generation.
@@ -4245,10 +4245,10 @@ else
       ifeq ($(TARGET_NO_KERNEL),true)
         build_ota_package := false
       endif
+    endif # INSTALLED_BOOTIMAGE_TARGET == ""
     ifeq ($(recovery_fstab),)
       build_ota_package := false
     endif
-    endif # INSTALLED_BOOTIMAGE_TARGET == ""
   endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE
 
   # Set build_otatools_package, and allow opt-out below.

core/build_id.mk

@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=SP1A.210720.002
+BUILD_ID=SP1A.210721.001