fix album bug1

fix album bug1
fix camera bug

fix camera bug
Merge remote-tracking branch 'origin/android_ym6'
Merge branch 'master' of https://github.com/GritBear20/facefuuuun
Merge remote-tracking branch 'origin/master' into android_lee8