Merge "Add service.proto jarjar rule"