Tidy platform common bits in diff Upstream-commit: 9431acbc0ab819ba3040b680e8ca05318c9c9156 Component: engine