Add missing variables for camera button handling

Change-Id: I40abd4344800e8cf61285923cc1fac9ba39d652c
Camera button support: fix FC

Fixed a typo in xml which caused Settings FC.

Change-Id: I0c01d03cc8effde9d8422e091a7389dcbb59ffa5
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2