Merge "Rewrite libpackagelistparser."
am: 8c711a5384

Change-Id: Ib373e7fc92d8d3e9b4979da54f56c64238501717