Merge "ApiLint: Add operator keyword and property parsing"