Merge "Return a more specific type from AnnotationFactory.createAnnotation."