jf: proper changes for google edition camera blobs

* keeps enhancements from samsung

Change-Id: Id347f26262b4c221d843ac4c3f90634689187439