Merge "Fix double-accounting bug in liblp."
am: 42294631a7

Change-Id: Icc511967cbd7ce549256896f25632c741ba1a89b