Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f
Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400