Merge "Update BCP computation to use derive_classpath" am: 7afb3a74ad

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

Change-Id: I0f77ef7c3ab1b7dcd970f2d5b143b338e3dadb46