Merge "Revert "Remove dependencies on the HIDL Vendor HAL from""