Merge "libbinder_ndk: recombine allocators/getters"
am: f1a1b02592

Change-Id: I961d215fe0c524e43378f480416115d7f634459d