Add a few more cases.

svn path=/trunk/tools/build/v2/; revision=83875