Pickup the platform detection changes from upstream.