Merge "apilint: Correctly parse packages with annotations"
am: 57b5479a6b

Change-Id: Ifbc59f9c0997ccf012a59a61b5e55476e14a2ade