Merge "Simplify ApexInfo classpath info" am: 3281d1b876 am: 045526da15 am: 1f0e7adc23 am: 52c0ee5c84

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931078

Change-Id: I1ca8de06eb62b6aa17a96fc5f8b5f93fae302b5b