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

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

Change-Id: I9bfcda2751dcb1c3863bc840329ae6bb4a0d0a21