Rename package_id to software_id.

Change-Id: I01ec25d56fa3eba1b7dc3233031fd758bf4e5130