Update for SGS4
Merge branch 'jellybean2' of github.com:TheCollective/android_packages_apps_Camera into jellybean2