Merge "libbinder_ndk: fix addService return type"