fix aicp build until we have time to bring it back and look into

Change-Id: Ia2a6bfe35a2eb9f6fea278504d3bb3a436c326ad