A patch from schroederc that fixes the tests so they....run....this will break tests that have not even been building
A patch from schroederc that fixes the tests so they....run....this will break tests that have not even been building

Change-Id: I77e0546d36b9c00e72e3f0c1952cc7f385cf8c27

clconway/shipshape,google/shipshape,clconway/shipshape,google/shipshape,clconway/shipshape,clconway/shipshape,google/shipshape,google/shipshape,clconway/shipshape,google/shipshape,google/shipshape,google/shipshape