Merge "AIDL CAN HAL"