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

Change-Id: Iee5c7d5cdbba6e2b4a78e7f3821fb2c4c56a5507