Fixing minor bugs in libcppbor. am: 61d9bff960 am: b3cd49bcd1 am: 50685cc010

Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2037164

Change-Id: I104cf2220c5f4301756a3f118a13fbf48ff65495