camera: Fix build after the following commits from AOSP
f952149bf9ab130a2dba82138c0c4c75fc758325
ad23a994e093ecc0e63a6ffdf7a6a8155f010c01

Change-Id: I25237d66a63790a812c0d0c0e4cae78aed05dda8
Merge branch 'cm-11.0' into cm-11.0_HAZE