Merge "libbase: add ConsumePrefix/ConsumeSuffix."
am: 7046bcb461

Change-Id: I7b6bf1110ba8ab6af131558135241ffb78669604