Merge "libbinder: RPC drop extra header info"