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

Change-Id: I2458331c4a0c8005b9095904c8ef6cec10088a91