nicki: encryption fix

Change-Id: I672d42ea66d7077374b5b93159de5a6492aadd29
nicki: Enable camera button

Change-Id: I1e291c18508e1a7b25740cb47d77fecf12c54968
Merge branch 'cm-11.0' of git://github.com/freexperia/android_device_sony_nicki into HEAD