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

This reverts commit bd7c9bec0c9e2147d55405271f369874337aee70.

Change-Id: I948afff474c8298efc061cd243eab54eab332375