Move r28989 to v1.7 - fix platform files so tarball can build