camera: this is not just for d2 anymore

  Had to manually apply the changes as outlined here http://review.cyanogenmod.org/#/c/61457/1

Change-Id: I54eb8a22de083bb14fb2c07af0f0e626a2ecc5c4