prepare for camera wrapper

Change-Id: I927717e438aaaeed220c89b3eec345c83a895c99
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_sony_pollux into phablet