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

Change-Id: Ib3eaf5ca57cc03dbcbb70bdac73a96b77c22fd32