COMPMID-976: Fix warnings for ndk-r16b

Change-Id: Ie6f1c2a88ece658eb491caa2c4838fb601104850
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122302
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
4 files changed