Merge "Fix compilation failure for AIDL Hal transport" into main