fix build for generic builds

Change-Id: I7654a801a2b168b7e0bcbebf680efbf2343b1ece
4 files changed