Update to 1.6.4
Build fixes for 10-CURRENT will come in a separate commit.
Approved by: hrs (mentor, ports committer)