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

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

Change-Id: Ie518f11e55d2d7767056b77ba5ef710f142dac08