Merge "Revert "Use android.hardware.graphics.allocator-ndk wrapper.""