Fixes for optimo and statx build

Change-Id: Iff1a65139546b0bbdddf616c9d78aa491e45adc8