camera: this is not just for d2 anymore

Change-Id: Ic6411156cf919c6fcc825405de95017ceffd55f8
Merge remote-tracking branch 'cm/cm-11.0' into HEAD