streamline the source of Zxing and update for update for support android-portrait