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

Change-Id: I76e107bbbb89e32f535324f393c8f4ad3341bed3