Fix QRCode initialization check in encoder
Merge branch 'binary-sa-android-fix' into binary-sa-bs-4.2
Merge tag 'BS-4.2' into binary-sa-bs-4.2

Conflicts:
	core/src/com/google/zxing/EncodeHintType.java
	core/src/com/google/zxing/qrcode/encoder/Encoder.java