Merge "Annotation processing for int enum and flag mapping"