Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."