Merge "Remove unused make variable BUILDING_PVMFW_IMAGE"