msm: common: Correct the cdrom iso build

Fix the Logical mistake of cdrom iso build.

Change-Id: Iea92f3a258b23f842dae73ef863406b42677b195
Merge "msm: common: Correct the cdrom iso build"
Merge dbf0976497907327e4855146c6738f0e15dd61d2 on remote branch

Change-Id: I20becf5dd82cc3031566bdd99b7bd7cd49f046cd
Revert "qcom: common: Generate cdrom iso dynamically as part of build"

This reverts commit 3973a6bb54fabf84fdb4dda3525b2dc3f27ec83a

Change-Id: I58c55d6c1713e6546b91903bf1a3b175c367faac

Conflicts:

	generate_extra_images.mk

Conflicts:

	generate_extra_images.mk
Merge "Merge dbf0976497907327e4855146c6738f0e15dd61d2 on remote branch"
Merge "Revert "qcom: common: Generate cdrom iso dynamically as part of build""