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

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

Change-Id: I8d32b022fb90b96017459dfa77ec9d14d76dc7f3