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

Change-Id: Iccbb4042411822a0c489a8f7622747a8dd23df4e