Merge "Remove unused HIDL mapper library from libservices.core" into main