Update to vesion 3.487

This catches up to the current released version.
3.485 introduced a build break on FreeBSD which
was fixed in 3.486. 3.487 was released a few days
after 3.486.

The changes in these new releases are all related
to bulding on Android. FreeBSD is just chasing them
to avoid a large chasm.