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

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

Change-Id: I50e56232b94b2f2438ab4f0dfd57b66ea9210895