Merge "Remove some stray stringpiece.h includes"