camera: Fix build.

Re-add the parts of commit 48a4f29bedbdcfdc6ba1157105b89f15536388fb that got lost in the merge commit c452ba6fbb190647b3121054334b8c964fa09c27

Change-Id: I25237d66a63790a812c0d0c0e4cae78aed05dda8
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0