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

Change-Id: I05c4843fa8311e187f738c3602364c62f71e6f23