Add build barrier to camera wrapper

Change-Id: I919fc83ca0ee2e615f7ae0ce0251df9e688082e9
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2