Merge "libbinder_ndk: avoid BpRefBase"