Fix Utilities and Modem in build

Change-Id: I7417d3aaac4cc40d8c5e4e68115964030468e1c3