Adapt to int/sal_Int32 mismatch on 32-bit build

Change-Id: Ifef81d53bee4241be3c0dd6b7ddb2c1bbf419b5e
(cherry picked from commit 9bdde8b420265c7e77f4b310fb4c1214b715aa72)
Adapt to int/sal_Int32 mismatch on 32-bit build

Change-Id: I9c5cb458ea7595c1b623ce14ed58fd3d5b3d961e
(cherry picked from commit f1e7489d98a1d1fd9e261e4a7e83fff03e5daf63)