Merge "Fix wrong integer type in AIDL bcradio utils lib" into main