am f71a2835: Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp

* commit 'f71a28354cf3339a744b4abb9571fe98f7bad4ee':
  PackageInfo is a class, not a struct