Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
am: 049543b771

Change-Id: I10712da29d0c84d2aa462bf892857e27c73f273b