Should no longer be necessary with the new handling of gb_STDLIBS.

Change-Id: Ia94a7266806e2d09d7608f642b25933e42499525