Homeland Security unit to consolidate aviation, marine assets