Merge "Switch @IntDef from long to int, and add @LongDef"