Merge "Add compat annotation processor for services/core."