Merge "apilint: correctly parse enum_constant" am: d8b953078e
am: 26ccde4b80

Change-Id: I36cc62620029d7a4387705fad441be24f5532673