prepare for camera wrapper

Change-Id: I3dff90cb306fba32ca862d14c51b942fcd45536e
Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_sony into phablet