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

Change-Id: I8ecc998a258c68f5df47f8bba5d5a539eefe6731