Merge "Add missing header necessary for libc++."