Merge "Replace android.hidl.allocator usage" into main