[CDO] Add CDO'ified models Fix the CDO'ified version of Architecture.genmodel Change-Id: I0bcd300a9c5d08598da830daceed0f1ca4c9bbbe