Fixes to get zxing compatible back to OS 3.0 as proposed by David Oster.