Merge "liblp: Clean up public headers."
am: b399456303

Change-Id: Ifc841146a44654490f57b67242d7a44944220a92