Fix build errors with trunk

Using mod_pagespeed svn revision 3121.