Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP." am: 9d4dbe09ed
am: 647a1d779a

* commit '647a1d779a0f0bbc6cd896df57d18725d300546f':
  Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.