Merge "Add new fields for carrying classpath information" am: 73336f8c82 am: 3b2fdd25e9 am: b0c4dac127 am: a1948b14b8 am: 675f313776

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

Change-Id: I53e8669226875679d8fe677d421e63bf3a2f8751