fix BUILD_SAFESTRAP changes

Change-Id: I4056db90907abe64cc7402154b239f88d996663c