Revert "Remove settings app java file"

This reverts commit 15546d39c6acdd3d52b291622f0fc59c833fa5f7.
Merge branch 'jb-camera' of https://github.com/shumashv1/android_device_hp_tenderloin into jb-camera
Fix up the sensor patch mess