Fix up Camera

Change-Id: I1b30c4c90a6f8acb5c0cf269fcb9974bb2377717
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_base into cm-11.0