Merge "apilint: Lint unhidden @IntDef and @LongDef"