merge from cm

Change-Id: I472a0b9eebb54b0c37e0691d849e989e5b3e342f
Add some Samsung camera color effects

Change-Id: I6bf0c7fa0b9b86ed56d8f974fe49564c02e6b47d
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_frameworks_av into cm-10.1