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

Change-Id: I89828f6636470e00ac034198aee724f10b7dabe9