Fix build for AICP

Change-Id: I4768ab2d50594d1fd78fbf726006058b62356ba1