Restore trailing whitespace in sqlite3 amalgamation.

Stripping the whitespace from the upstream-maintained sqlite3 code just
causes merge conflicts with no benefit.
Fix format string type mismatch in src/capability.c.

The type 'long' was correct on most machines but not according to the C
standard and Windows 64-bit.
Fix const qualifier on raw_mask

Fixes compilation warning about losing const qualifier in assignment to
non-const variable

(cherry picked from commit 6d9c3f50944e1da3bf3a1be6454f85d6d6f7ab37)