Camera button support: fix another ^C^V fail

Yes, that was merged way too fast...

Change-Id: I88243887446876de39e79020e6d8fecc6351bdde
Merge "Camera button support: fix another ^C^V fail" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2