Remove more FwUtils dependencies from FDO

Change-Id: If105bae1bb699e4b3273b028d36da6c3cb957675