Merge "msm: Do not use offset, when reporting image version string"

#define SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE 128

#define SMEM_IMAGE_VERSION_SIZE 4096

#define SMEM_IMAGE_VERSION_NAME_SIZE 75

#define SMEM_IMAGE_VERSION_NAME_OFFSET 3

#define SMEM_IMAGE_VERSION_VARIANT_SIZE 20

#define SMEM_IMAGE_VERSION_VARIANT_OFFSET 75

#define SMEM_IMAGE_VERSION_OEM_SIZE 32

		return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "Unknown");

	}

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	string_address += SMEM_IMAGE_VERSION_NAME_OFFSET;

	return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.72s\n",

	return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.75s\n",

			string_address);

}