Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."