(Android) C90 build fixes