Merge "apilint: Correctly parse packages with annotations"