Remove more FDO references to FwUtils

Change-Id: I7fd14e8b13ae896fe476712c00ed120734bb6070