Fix compile conflict w/ unpoison-partition-context
Fix compile conflict w/ unpoison-partition-context

Fixes compile failures with unpoison-partition-context and
ext-partition-types.

Change-Id: Ibedab7d927d6bf7329a5fc5a3050aa6272d4b254

GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom