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

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

Change-Id: I735bb9b5c92e961779f2acccef5be4622f6e4d08