Merge "ApiParse: Clean up parsing code"