Merge "Add support for building test apps."
Xavier Ducrohet [Tue, 28 Aug 2012 16:51:09 +0000 (09:51 -0700)]

Trivial merge