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

Change-Id: Id38d5f11aedd8867399b725086276d85da878fe0