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

Change-Id: I5d31a28d0b38c296fa9edcdf1bb7353b1b35c387