+Build engineering fixes for MultiCDA

Change-Id: I12e94e2d0160be7ab0e5a298d725f0ee3b1aa6fa
4 files changed