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

Change-Id: I7d12ed9f2ac7fcdc6490a7fcd2e5c99a21fe7110