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