fix the compatibility JDK1.6 to core/main
fix the compatibility JDK1.6 to android/src
Merge commit '23330c4e53ff1251c1ad9bbbb4cdcab4ad5d707f' of git://github.com/zhangchaoxu/zxing-android