Merge "Remove libbase_headers from libservice-connectivity"