Merge "Fix AIDL VHAL metadata extraction script" into main