Merge "libbinder_ndk: separate libbinder plat headers"