Merge "Merge "Make bitmap.h C-compatible when __ANDROID_API__ >= 30" into rvc-dev am: 0fc505a42d am: 7c1abfb600 am: 339c33eacf" into rvc-qpr-dev-plus-aosp am: 992545a6ac

Change-Id: I59b0815673827c790b405b40d932392e5b448262