Ported r2834 from ZXing

Original commit message: "Aztec updates from fyellin"