Merge "Make bitmap.h C-compatible when __ANDROID_API__ >= 30" into rvc-dev