tree 5eb2d5e54d81088efd62085d2e9c2ce33375664c
parent e9034b4502ae6e693ad52fe2e435066dc969a3ab
author Dan Albert <danalbert@google.com> 1413517565 -0700
committer Dan Albert <danalbert@google.com> 1413517565 -0700

Some more test cleanup.

Needed to build successfully when libc++ is the default STL.

Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.

Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837