Merge "apilint: correctly parse enum_constant"