Merge "Simplify ApexInfo classpath info" am: 3281d1b876

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

Change-Id: I3cbfce7284868a805e47c2a1ebe9ca2db3142247