Merge "Simplify StagedApexInfo classpath info" am: d43bb670f9

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

Change-Id: Ie808041eb75f885ecf3ca15ecb7b2b6e47aa43a0