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

Change-Id: Id11ded3d7b3a4e079bdf37428d0ec6651f082992