Merge "Enable pooled C2BlockPool" into pi-dev am: bb32f8706f
am: e3b5f83ff1

Change-Id: Iab413601e84c3fb4a5024fb54fc3bc0ee13f3f17