Fix build (remove conflicting CIR module files)

Change-Id: I123ec58611adc85538cc77753be7ed616fb99ff5