Merge "Remove declaration of hidl manager -> base dep"