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

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

Change-Id: Ibf1cb5eaa7af5e63244ceaa9bd104838e1cd3306