Merge "Revert "Convert vendor HAL service to use new AIDL interface.""