Merge "libbinder_ndk: recombine allocators/getters"