Merge "Rewrite libpackagelistparser." am: 8c711a5384 am: 6a25d17aa1
am: 45fcb8b83d

Change-Id: Ifea2740bb067da7991e5b9206658d3ba56804868