Follow our own SMKD-Qcom

Fixed gcc11 errors in ours

Change-Id: I66d9ff3de71c9be4113022f9d7d7147bcbbf40f6