Merge "Convert Shader to NativeAllocationRegistry" into oc-dev
am: 3afc07ae7b

Change-Id: If30bf388289e5726edbb31b6b88343455e68b09c