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

Change-Id: Ideb9e1a22a267b609e5773e9918ee088636a3152