Ported r2692 from ZXing

Original commit message: "Add warning about test text files that may
have a spurious newline"
WIP
WIP
WIP
Misc fixes
WIP
WIP