Merge "Changing cbor-java to static_libs"