Merge "Fix support for building and testing libraries."
Xavier Ducrohet [Thu, 30 Aug 2012 22:41:00 +0000 (15:41 -0700)]

Trivial merge