Merge "delete HIDL adapters"