Merge "Codec2CommonUtils: Reduce android_get_device_api_level() calls" into main