Merge "Fix compilation against latest checkout of external/icing."