Merge "More refactoring to build library tests."
Xavier Ducrohet [Wed, 29 Aug 2012 18:01:32 +0000 (11:01 -0700)]

Trivial merge