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

Change-Id: I27ea585e5a460109431d3c8296eba1008451b03e