Merge "Revert "Link PlatformProperties statically""