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

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

Change-Id: I9b52592eae2a62c84c673cd6d3cfdd7817df9a36