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

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

Change-Id: Ic1f8496889355d7037e7d974604175c6bf738975