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

Change-Id: Idd1771a8af95e865033f357a3e476713f102c52f