Hopefully this should fix up the most important external libraries.

Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400