Merge "Changing libcppbor dependency" am: 2f973a7453

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1627962

Change-Id: I7333ce58eeedd23d51f20ce9927e06cfdcd2b33a