Jb mr1

Merge to bring Camera up to date as of this commit, merged in bm's camera with AOKP.