fix build

Change-Id: I2830493fc36529e20dbf9af0720fec5f3b9698f8
Merge branch 'jb4.2' of https://github.com/ParanoidKang/packages_apps_Camera into jellybean