Add missing variables for camera button handling

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