Add missing variables for camera button handling

Change-Id: I40abd4344800e8cf61285923cc1fac9ba39d652c
merge changes from CyanogenMod 10.2 into local branch