Merge "Simplify StagedApexInfo classpath info" am: d43bb670f9 am: e98ec421a6 am: 3afdab0078

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1927453

Change-Id: I1c4d1ebae7d77a9f04265a34b5ea71ee3454d21a