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

Change-Id: Ifc31eb85ccebb4d8f9fe08edb1a93afb8ed0fd04