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

Change-Id: Ie5646faa1b8bf2665d70ed683dbd365e6c550c13