Merge "apilint: correctly parse enum_constant"
am: d8b953078e

Change-Id: I633edc113833f49a4d96fafe4dfa1d9a1b49c357