Spread @IntDef across all int-accepting methods
Merge branch 'makovkastar-intdef-annotation'