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

Change-Id: If61fb5905e827dc9836e24714a24908eef326d1c